Testing the changes

• I tested the changes in this PR: briefly

Local build testing

• I built this PR locally for my native architecture, (x86_64-glibc)
• I built this PR locally for these architectures using specific masterdirs:
  • x86_64-musl
  • i686
• I built this PR locally for these architectures (crossbuilds):
  • aarch64
  • aarch64-musl
  • armv7l
  • armv7l-musl
  • armv6l
  • armv6l-musl